From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 26 Apr 2025 14:30:20 +0000 (+0300)
Subject: Fix 'kill-ring-deindent-mode'
X-Git-Tag: archive/raspbian/1%30.2+1-2+rpi1^2~2^2~24^2~37
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22Program/%22http:/www.example.com/cgi/%22https:/%22Program?a=commitdiff_plain;h=b4b7ddb603f917a7883c71211b3042e4fc29049b;p=emacs.git

Fix 'kill-ring-deindent-mode'

* lisp/indent-aux.el
(kill-ring-deindent-buffer-substring-function): Fix deindenting
for modes which set 'indent-tab-mode' to nil.  (Bug#77981)

(cherry picked from commit 1c7fe501fedb41aaf5b22d82dab5a365f86e4c85)
---

diff --git a/lisp/indent-aux.el b/lisp/indent-aux.el
index 27d5875bc22..eeb8f1ee6bb 100644
--- a/lisp/indent-aux.el
+++ b/lisp/indent-aux.el
@@ -45,10 +45,14 @@ is yanked."
           end (max a b)))
   (let ((indentation (save-excursion (goto-char beg)
                                      (current-column)))
+        (i-t-m indent-tabs-mode)
         (text (if delete
                   (delete-and-extract-region beg end)
                 (buffer-substring beg end))))
     (with-temp-buffer
+      ;; Indent/deindent the same as the major mode in the original
+      ;; buffer.
+      (setq indent-tabs-mode i-t-m)
       (insert text)
       (indent-rigidly (point-min) (point-max)
                       (- indentation))